DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I0cddc58644ab80a4e10b52d9df8c7ecdecce2519