[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 96f07d819b -s ours
am: 5174cdc09b

Change-Id: I78585c0e0bbb1c6adc09aca5e3e846075ea92ddb