Snap for 7132927 from 295b4dd071e8f44c86aefe8f2eecdfcdd7d8795a to mainline-conscrypt-release

Change-Id: I479508fc735facb7b330379fa740bbbf699b95c7
tree: 63046532e5ef5803f9673715dd217c99975f325f
  1. build/
  2. os/
  3. Android.bp
  4. OWNERS
  5. TEST_MAPPING