DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I905b87157d2d3017c9648198e82fc78e6b52aa30