DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I17e579c2e94383d34beb64e82457b7a8d9f4c444