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

Change-Id: I22bd2201b0cc2b3bcbf8d1eb740a91485735d03f