DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I12c299b18f26a6135dc8573693318679f443b5df