Merge "Merge "Un-hide Connection-side RTT APIs for Dialer" am: d35e81d615 am: 01ae6fc2cd am: 8e1b207ba5  -s ours"