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

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

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



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