Merge "Fix the user ID check in note controller for updating note taking...

Merge "Fix the user ID check in note controller for updating note taking shortcuts" into udc-qpr-dev am: 8228c296

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



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