DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I42a9409f1842370a61c0065c889f74cca9313a70