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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a3d1baf4a9449831261728c6f6bb092ade3816b