Merge "Update notetaking lockscreen quick affordance error dialog strings"...

Merge "Update notetaking lockscreen quick affordance error dialog strings" into udc-dev am: aaf9a755 am: 2a24c407

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



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