DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I48461c06d1ed34045ef251b647cf193c602b4780