Snap for 8558685 from fa53f6ee90425b3f31f4dbe621e65efd7754821e to tm-frc-conscrypt-release

Change-Id: Idbb3d17f716347792d81bb052e322a1b7495e8b5
tree: 8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml