Merge cherrypicks of ['googleplex-android-review.googlesource.com/23583481'] into security-aosp-sc-release.

Change-Id: Ief9dbdd9b4bc64132ffebd88208c987525f3ce79
tree: b505e5419c94eeb8b847f3d82e24750283fb36b1
  1. files/
  2. google/
  3. soong/
  4. wfa_certs/
  5. Android.bp
  6. METADATA
  7. OWNERS
  8. README.cacerts