Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"