DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ib2a641d71ae0cd7049433d69f72cb666d236886b