Merge "Hide notes app lock screen shortcut when there is no default notes app...

Merge "Hide notes app lock screen shortcut when there is no default notes app set" into udc-dev am: 9b957e80

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



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