Merge "Ensure PIN/PUK status is taken into account on HAL 1.4+" into sc-qpr1-dev am: 76a18880bb

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

Change-Id: Ia8838d2ec671d3f525fbc2415fbf3f79702db43e