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

Change-Id: I7b0a3625ef33ec814e9800463d72656428a38058