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