[automerger skipped] Merge "Add setting to disable PIN animation and password" into tm-qpr-dev am: ba2410e972 am: d9565bbfa0 -s ours
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 12ca3f4622 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21372798
Change-Id: Id8dad5647ded52e13bde5fe9b9bd6a7cc303494a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: