Merge "Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5 am: 562a3f81c6" into qt-qpr1-dev-plus-aosp
am: 86e816d5e9

Change-Id: Ia93f7ae63e407c95310963bdc1b9ead2c0c80994