DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9dbf402e02a0e97e3cffbdde99f7f2b3756b4647