DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Idd1c83dc46f167f4b79092803539c3dd37a88ca3