DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If4ff6828d14882efc70ab48e5e36ffe99e0c3289