[automerger skipped] Merge "Populate carrier id in anomaly reports." am:...

[automerger skipped] Merge "Populate carrier id in anomaly reports." am: 694586e2 am: c4f5fe32 -s ours am: a6b0e0f2 -s ours

am skip reason: Merged-In I68f1296631bfaf0228db93cd5a5ba1c58ab03044 with SHA-1 c7718e14 is already in history

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



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