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

Merge "Merge "Update notetaking lockscreen quick affordance error dialog strings" into udc-dev am: aaf9a755 am: 2a24c407" into udc-d1-dev-plus-aosp am: 626fb1c2 am: 4dba9259

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



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