Merge "Refactor PinStorage#storePin to avoid dead lock when unlock PIN." am: 4a59a2d838

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

Change-Id: I8614344ff3557cb61b473b08b8d91b7eff79cd20