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

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

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



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