Merge "Populate carrier id in anomaly reports." into tm-dev am: 7742f486 am: 80089da8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179542



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