DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ic655324c52447411209c7ab8c225af31e3f92241