DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3