Merge "Revert "Refactor PinStorage#storePin to avoid dead lock when unl..."" am: 368f143804

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

Change-Id: Ia5a0c36529c6f831325c994491d1e7c0cb38e6ba