[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 38ed224625 -s ours am: fcc92b6fc1 am: 3c26bb0f1b
am: e37a2bcfba -s ours
am skip reason: subject contains skip directive

Change-Id: Id17f6f1cdae5a382a903d89c4edf5059b70284bb