DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I5feea6ef94bbcc12db101e81420b951a4d43eb7f