[automerger skipped] Merge "Add SIM PIN caching availability in dump" into...

[automerger skipped] Merge "Add SIM PIN caching availability in dump" into sc-dev am: de114834 -s ours

am skip reason: Merged-In I084322086da7df7e4e0232a841c2613447e3da41 with SHA-1 b711a4d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14671674

Change-Id: I3a18e46a3ea4eefd04a48f1237a068b29bca7ad6