[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: 251b49f0 -s ours am: 8eaff5e1 -s ours

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

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

Change-Id: Ic5a904d7d4cef20d63a6260736148552d8139642