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

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



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