Merge "Migrate LTE_CA flag to NRI from DSRI" am: 83cbf59a70 am: 0f6ee9e766 am: e2505847e4 am: 14bac37773 am: 8f0839f190

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

Change-Id: I0cccc8c7274c3d5a5ed1c24630523c9fd6a021de