[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: b756d28735 -s ours
am: 05f990c7cb

Change-Id: Ib4de73fb4e5880149d980a4db30c40857e556b35