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

Change-Id: I510ed2b8dfdbbb3563cd31c8630973790eae023d