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

Merge "Merge "Hide notes app lock screen shortcut when there is no default notes app set" into udc-dev am: 9b957e80 am: f79f20d4" into udc-d1-dev-plus-aosp am: 0d1f7101

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



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