[automerger skipped] Support legacy cell broadcast fields am: eac04a4a am:...

[automerger skipped] Support legacy cell broadcast fields am: eac04a4a am: c7754c4e -s ours am: 907f594f -s ours am: edc47fa8 -s ours

am skip reason: Merged-In I76c0667651214df432b71a2d43acdcff4b2fac85 with SHA-1 1f936285 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2681802



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