Merge "Making OK button re-appear after 5 failed attempts of entering the PIN"...

Merge "Making OK button re-appear after 5 failed attempts of entering the PIN" into udc-dev am: d2f71839

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



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