[automerger skipped] Add setting to disable PIN animation and password am:...

[automerger skipped] Add setting to disable PIN animation and password am: 30bf66db am: 51cb60cc -s ours

am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 387b788b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281



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