Merge "Enhance metrics related to PIN storage" am: 00586ccbc9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2123f3715a33bece5a9e8127d45d01fbe22a4224