Merge "Support legacy cell broadcast fields" into udc-dev am: e72725c2 am: cdabd554

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



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