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

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



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