DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I8ab306d25c9201383704fd8dc5e1f0d91c89576b