DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ie0a3296ca9445b58b9d411e8dc21030bff78f35a