DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id59b59f4e91e6f7e140bd74863345a51d7f8feef