DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I73d74715a8dc817b6aacb7fac3460cad0054be3a