Merge changes from topic "note-shortcut-in-settings" into udc-dev am: 87e00d24 am: 112cea57

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



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