[automerger skipped] Merge "Add additional metrics for PIN verification...

[automerger skipped] Merge "Add additional metrics for PIN verification failures" into sc-dev am: 8e6e2c2e -s ours am: d40c93f8 -s ours am: 8138093b -s ours

am skip reason: Merged-In I5d943792e1e91919ff476efe3991ed3a5cce95fe with SHA-1 f722437b is already in history

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

Change-Id: I7a66f73ce01d12343cfcf9455add4e3daa44dc5f