[automerger skipped] Merge "Populate carrier id in anomaly reports." am:...

[automerger skipped] Merge "Populate carrier id in anomaly reports." am: cf4cc8c1 am: 68c6469e -s ours am: 4cf44916 -s ours

am skip reason: Merged-In Id3859dad6a64be61d38865562887879878d08af9 with SHA-1 9e41ab3c is already in history

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



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