DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ifd3b99660fd3d2bf4b00dad4d30a7bdbfa35f0fc