DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I0f2a4d898ccfab7f5215d9bbb3c2c9fd4f7329cf