DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I8916b664519a85b79710ba430738a505c25a28e0