Merge "Stop exposing LTE_CA as a rat type." into nyc-mr1-dev