DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I5ef84d95253ba12ef0ad36fe1f055a2e9d4844ad