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

Change-Id: I20a312de92e57e91f4990a68f4c962850557128a