DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id5c7c0c40d29884640b649db217be1eb86ee9147