Merge changes from topic "cp-att-rtt-switch"

* changes:
  Fix call to ImsManager#getInstance
  RTT changes for ignoring user-set setting