DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963