Merge "Add GERAN to Docstring for PhysicalChannelConfig" am: 9aca73a930 am: 83da6cfd93

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

Change-Id: I640d2296893441433d2c87c9379712044392c9f4