Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac

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

Change-Id: I4eda5a40309922e27d2171617ad6b50469d5ae67