[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: c5804720aa  -s ours

Change-Id: I08a9fdc0f8e5ef6f101ba5d247defc38c4659719
tree: efd6e004377e585a434c7da0967bffb0a5b7d2b0
  1. androidx/
  2. com/
  3. net/
  4. org/
  5. .gitignore
  6. Android.bp