DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If379604dd96f6ffdd1fd3d4ed224f474eb8536b8