DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ibc86fa129ddc833a2059730c5c7b309aa3f793aa