[automerger skipped] Merge "Cherry-pick "Add band mapping for GERAN and UTRAN"...

[automerger skipped] Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e554462 am: 96caf6d1 am: b09d63e1 -s ours

am skip reason: Change-Id I3e8a168a288a436739c369cdaa2ad00f4b4576ed with SHA-1 4bdb3e05 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I302d89d7fe6479179d7860cd4cf004e7a17eb952