DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Icd401ad4d25c9a48e3befba9d6aae66cc5f67785