DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I2bdaf1520b9e5ad8a4a8ed2f5b0bf3d8c33f083f