DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ia953a8e6fecc711ca416d02ea5d96e05c6209c54