[automerger skipped] Merge "Add limitation for the password" into tm-qpr-dev...

[automerger skipped] Merge "Add limitation for the password" into tm-qpr-dev am: 090f8dca am: 96d794d0 -s ours

am skip reason: Merged-In I216d91c083dfe36cbda84481a8d0a308cfa8bfa1 with SHA-1 b4d94115 is already in history

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



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