[automerger skipped] Merge "Revert "Refactor PinStorage#storePin to avoid dead...

[automerger skipped] Merge "Revert "Refactor PinStorage#storePin to avoid dead lock when unl..."" am: 150e9223 am: 2e04a692 am: b43cb9f4 am: 011af772 am: 450e2866 -s ours

am skip reason: Merged-In I8d2baa6d6fdc1a39f22b66d521200b7dbd43e0b4 with SHA-1 02ab1419 is already in history

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

Change-Id: Idec615db41e497466d10f99fe49b13f4620bbb0f