Merge "Device asks for PUK code instead of SIM PIN" am: 7cc71c63 am:...

Merge "Device asks for PUK code instead of SIM PIN" am: 7cc71c63 am: 12526eb5 am: 5b5a75b3 am: a1b06070 am: 9610e64d

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



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