DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I53ab66dd32b7a69f04226fccfdf372a66489964a