DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ic5fecd7073f550f977d76aaf709382e23402421e