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

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

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



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