Merge "Implement RcsThread querying (base)" am: 7ec9e6849e
am: 57d3db1230

Change-Id: I409f34fddeb833802be67cc2c49767ba8157af24