Merge "Fix CTS for UiAutomator device orientation in tests" into jb-mr1.1-dev