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

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

Change-Id: I59847faac66961cbb07d509779d4118547ecd7a0