DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If26211b210e0f209121cf88ea1af1e7652d1dce6