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

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