DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I6b0da2402fd6907ea87caca37b5f9f11e06d2586