DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I836b8ceed9e7816ddc2c280cbb9be3b722c51199