DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If2b62160845364588a0932632b59ebac41a78f57