Merge "Add limitation for the password" into tm-qpr-dev am: 090f8dca

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



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