Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222 am: 96caf6d111

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d123b95985960f4f8e0243e22071e5aa8fc69dc