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

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

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



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