DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I7f92dfad9cb6bb2a5f618a9302d511891b0112be