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: I7ecd538533642c06b73561b956578adee868de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>