[automerger skipped] Merge "Ensure PIN/PUK status is taken into account on HAL 1.4+" into sc-qpr1-dev am: 76a18880bb -s ours am: 56e4cf8d12 -s ours

am skip reason: Merged-In I5a5cce01478db19bf0e4331033a53bdcc677a226 with SHA-1 33fda61178 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/16382902

Change-Id: Ia86cf599728d4c6a58ec4d9c0f597c76a1018a6d