DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ibbfd96cc3e8877cf743a0e56ef2da69cdcf97dca