[automerger skipped] Merge "Add carrier config for ignoring user RTT setting" am: e93165456c
am: 7fe39a8776 -s ours
am skip reason: change_id I481fb945fd76181a0c59cb433c2959b532127153 with SHA1 788d01b71e is in history

Change-Id: I5a8d85125754ec861383f6aea9fe6e4a26506409