Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: a464fca2f1 am: 4e6f8dde46

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

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