DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ia589938a885c0bd776d79955bc7c9fb56090808a