DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Idf5a1366c365b45a542eb63e110f32c5c1a662ce