Merge "Use Note Role Holder when opening Note Task" into tm-qpr-dev am: 1a1482dffb am: c07303e026

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

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