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

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

Change-Id: Ie917e29b77236665308dde0384d88073b6439125