DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ieb5298f552c800e60647be5a75f754f0df5b374d