DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I420c7300b0c15b7e438c58de5e27eaf30545b72d