[automerger skipped] Merge "Add setting to disable PIN animation and password" into udc-dev am: 8b71dc930d
am: 0d883efab0
-s ours
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 9e364dcebf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591508
Change-Id: I1fac500209e40971809c27574c76423cdc58ab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: