DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I5f3596d149f2f4319f780b43f38a1967a6ca2f51