DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I7624257e4cffc690f0df4c844b23cd2accddca4b