DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ief1c0eaed98d2a196bca066bfeb83a16e4410887