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

Change-Id: I2a20c3f66bd9ae7fa71143aa6d4732a9fb1123af