[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into...

[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651ae am: ee77d819 -s ours am: 87dca7b5 -s ours am: ad26c287 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222



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