DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I97b1574b40b11d420d5ca9a00900b35816844ed0