[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 63e79bce62 -s ours
am skip reason: subject contains skip directive

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