Merge "Update Note Task shortcut when Notes Role is changed" into udc-dev am: 9bdd9880 am: 3782aec9

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



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