Merge "Populate carrier id in anomaly reports." into tm-dev am: 20b28bf9 am:...

Merge "Populate carrier id in anomaly reports." into tm-dev am: 20b28bf9 am: 616c945b am: 813e2b54

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



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