DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3