Merge "Add CarrierConfig key for RTT support" am: e5a913661d
am: 79dc6fb815

Change-Id: I11ef3f96e578e077288fe60725d326a20f45daf1