Merge "Merge "Add unit test for sim pin and sim puk views." into tm-qpr-dev...

Merge "Merge "Add unit test for sim pin and sim puk views." into tm-qpr-dev am: 8ab6e160 am: 02885042" into udc-dev am: 94b34e6f

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



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