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

Merge "Update notetaking lockscreen quick affordance error dialog strings" into udc-dev am: aaf9a755 am: 5effd8ac am: ff3b9362

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



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