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

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