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

[automerger skipped] Merge "Add additional metrics for PIN verification failures" into sc-dev am: 8e6e2c2e am: c5d92c81 -s ours am: 54f93885 -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: Ibc68582114a1488d7fec8d85e56aa551a3d1a05d