DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I0dcb6b2b9015a6545103a267584dbaf45fdf213a