DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ie5c31d330c03a37d1f64f2a21638bea6aacce1bf