Merge "Use `IntentSubject` to simplify `NoteTaskControllerTest`" into udc-dev am: d130b60d am: 44a8bcc1

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



Change-Id: Iec2988b0241339d40314bd19d87333416af87266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>