[automerger skipped] Merge "Add carrier config for ignoring user RTT setting"...
[automerger skipped] Merge "Add carrier config for ignoring user RTT setting" am: e9316545 am: 7fe39a87 -s ours
am: be6af82a -s ours
am skip reason: change_id I481fb945fd76181a0c59cb433c2959b532127153 with SHA1 788d01b7 is in history
Change-Id: Ice62d643664179abe74e288b8ece20649cdf2113