Merge "Clear and re-focus pin password entry field" into udc-dev am: e044f614 am: 22140b9d

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



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