[automerger skipped] Merge "Collect sim voltage class and pin1 metrics" am:...

[automerger skipped] Merge "Collect sim voltage class and pin1 metrics" am: 9d7d9b64 -s ours am: 2d024ba6 -s ours am: a2fa67ae -s ours am: 28386241 -s ours

am skip reason: skipped by user kiwonp

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



Change-Id: I3d93ac88636dc7c376985ce8ef8f2a121b907019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>