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: Ic156240e542d570f97cf020ce2e40b7252c0d731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>