Merge "Set RTT capability properly in AccountEntry"
am: 65cd287503

Change-Id: I81532aa70e89bf31a40b7cdfb3c610d2bf9c7517