Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am:...

Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: a464fca2 am: 4e6f8dde am: 6eda0046

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



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