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

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



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