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

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



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