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

Change-Id: I3ad22207292826302a80907968a5d9215af1409e