DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I473cbf8f4f53a00f4c7dafce18a5ad23a1614332