Merge cherrypicks of ['googleplex-android-review.googlesource.com/23583481'] into tm-platform-release.

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