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

Change-Id: Ia97dc4e010f0470b8eb37c1556e35774a67945c2