Merge "Add carrier config for ignoring user RTT setting"
am: e93165456c

Change-Id: I73a4ab7963525669ccc74ef634345077e0ce618f