DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ia3e7ffa570fba2de88f0fbed775e070fe4d6e29f