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

Change-Id: I27b512bc894882c5575c23b1c6f51a101bc37234