Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal."