DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I20eda906f06b84b148b1b94439e8092d65ea6b4c