Merge "CTS: Use cmd activity instead of am" am: 45eb89bd05 am: c8f5df263d
am: 3ccd80611c

Change-Id: I9dbd55b1a3bc4956fc204484a017706cc98601c3