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

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



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