[automerger skipped] Merge "ImsStats captures crossSIM calling" into...

[automerger skipped] Merge "ImsStats captures crossSIM calling" into udc-qpr-dev am: a9a65ee0 am: 6feca492 -s ours

am skip reason: Merged-In I816d483dfc1c20da4c57811bc17acaee13bdea3b with SHA-1 d9e14b8b is already in history

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



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