Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 264c31532f

Change-Id: Ie3c446695b411413e19469b202a59c17d25f5fe9
tree: e4b5ecb61cc0f6750663753827c09995c3ce099b
  1. android/
  2. androidx/
  3. com/
  4. Android.mk
  5. NOTICE.txt
  6. source.properties