Merge "Use `IntentSubject` to simplify `NoteTaskControllerTest`" into udc-dev am: d130b60d am: 2757ca27 am: 1b072ed9

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



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