DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ib11313bef8f129e109d11e656b29c9b753137265