DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I157ff596deb419a57eca32a9b8d954d76294f627