DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I67e45067cbd831b3a64e6a41b3553de9cbcbc192