Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5
am: ecb319ce06

Change-Id: Id400b5cda1fbdc6f9f7d9ae32198c304f694ec0d