DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I77aa6d15a81bd63bfdb03a36ef73c9bf8a148cbb