DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I97bbdae04e76ce32de0c25ed580b95ef2ec9a5ee