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

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



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