Merge "Update RTT CTS tests for changes"
am: b6ec47d8e8

Change-Id: Ia4829bd4969414f82addefc0b3ce0237c59f22e7