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: 394b008a am: b3843d73 am: 83b336e2

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



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