[automerger skipped] Merge "Add TestApi for getSupportedRadioAccessFamily" am:...

[automerger skipped] Merge "Add TestApi for getSupportedRadioAccessFamily" am: 0b2d583b am: 1a7ff7db am: b71d2d2c am: 6fdc279b -s ours

am skip reason: Change-Id I7d1e2973bc42f04ab0d28752bce9ed8fa93fdba9 with SHA-1 9d0b903e is in history

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

Change-Id: I0e08828c939e27d5f1a054d4ac34016aff34e12c