DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8