Merge QP1A.180823.001

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