[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 2e2b1e7c1e -s ours
am: 0a123b71c3

Change-Id: I73da6761103bb8538b042486ced80059b162d02b