[automerger skipped] Merge "Add setting to disable PIN animation and password" into udc-dev am: 1b8e7128 am: c35a431d -s ours

am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 12ca3f46 is already in history

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



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