DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I080f3d367eac6995ef5681bd2242564e4be1630f
tree: 7061d91d9e7bb304b45d9b9286491a4710628fcd
  1. androidx/
  2. com/
  3. net/
  4. org/
  5. .gitignore
  6. Android.bp