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

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



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