[automerger skipped] Merge "PerSimStatus: add field for cross-SIM calling"...

[automerger skipped] Merge "PerSimStatus: add field for cross-SIM calling" into udc-qpr-dev am: f0eb60b1 am: e51ebe3c -s ours

am skip reason: Merged-In Icfac47d1aca3bcfde9689113dab82c7bdd8ea5fe with SHA-1 5ae7b9f2 is already in history

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



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