[automerger skipped] Merge "Cache SIM PIN for verification after unattended...

[automerger skipped] Merge "Cache SIM PIN for verification after unattended reboot." am: c047965e am: 1e7b0e68 am: 38c0ece1 -s ours am: 7c379238 -s ours

am skip reason: Change-Id Ifba934667602eda40d0c1dbe98714f210eef76d2 with SHA-1 27c78d5f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05737bf3dc33a54811ab3593f251b191901162ea