DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I33695dbdef28e4ccea07a1fe3eb57d928a19da5b