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

Change-Id: I4ec278f4254cb14aeaba384e9ea5debc2c260639