[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 63e79bce62 -s ours am: 665e193847
am: b17e64188f

Change-Id: I621c0e2f94ce5a6de0f5ba861e06e478481a22d9
tree: 0832b1592aa8200e0d8b30639bfea5813030a20d
  1. android/
  2. androidx/
  3. com/
  4. NOTICE.txt
  5. source.properties