Merge "Merge Android Pie into master"
am: 5505e89bae

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