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

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

Change-Id: I3bccf2b395d02a62b33c6372f2b9c5b09388d88b