Merge "Merge "Implement shell commands to allow for CTS testing" into qt-dev am: a9f9fbcc0b" into qt-dev-plus-aosp
am: 50730991af

Change-Id: I7485cb5db34917da8f5c1caed04bab0fae37ee1b