DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id604105761e5156d67182cf757dee611bcb5f935