DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ie70fb2f2073293b4ac3e4590cb4e62baf8274f58