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

Change-Id: I82e1562942ce3c8643ad8c3dd48c104d5931d5b2