Merge "Annotate TaskKey#baseIntent as @NonNull to match platform" into sc-v2-dev am: 1b3f782d94

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306726

Change-Id: Ied300729450e0aefdb11946269264820b5cf89b1