Merge "Merge "Update CtsPreference2TestCases to prevent test app in landscape mode will fail" into pie-cts-dev am: 453c6d2bea"