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

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