DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I74e378c19586cb1d32088a8444f47595ad0ecdd7