Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb
am: 6689b57b66

Change-Id: I35ec391a2edcc4d64bc7330415505f700b90a568