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

Change-Id: I98daf42082dad92a6ea0956e34102db4b7ca0803