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: 4537e737 am: ae2a3988

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



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