DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Icac6391009e3a198f2003344ae5d4609cf834e11