Merge changes from topic "metalava" am: 9cbafb8ccc
am: 4f77c65065

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