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

Change-Id: I29f695ab1975131cad1d88f1cd9eabe49c311760