DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I971ea1db5b37fca8a651cba85ba12c44d13e07c1