Merge TP1A.210812.002

Bug: 198367246
Change-Id: I227ff097df4ed9f8c0cd6d50526392892654fc87
tree: a3f770b3843715cb360defea720bee07a510c6f0
  1. androidx/
  2. com/
  3. net/
  4. org/
  5. .gitignore
  6. Android.bp
  7. METADATA