Merge "Add CTS test for the capport API" am: b0d3cd455c

Change-Id: Ieec3bd1d21daddcbac98114857d44cf9eb93fa10