DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I8b74ae19788aaaca75ad44c465f7dc458117ccf1