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

Change-Id: I226cbd5adb50ad90edadd4607e0067107f34be22