[automerger skipped] Merge "Cache SIM PIN for verification after unattended reboot." am: 9121c73da0 am: 69f8bfe545 am: 528ccf397e -s ours

am skip reason: Change-Id Iab402b2651b9dac78f3d40d5bea9b929d31db54d with SHA-1 5e41151a1c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I603f63388849bf553db0015eb6d74b3fdcb2b401