[automerger skipped] Merge "Add limitation for the password" am: 4c0ca9b8...

[automerger skipped] Merge "Add limitation for the password" am: 4c0ca9b8 am: 46e5b654 am: d8098cd7 -s ours

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

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



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