DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I544182ded73bb332d8b6277c02e854a4bcd9e1a6