[automerger skipped] Merge "Merge "Update CtsPreference2TestCases to prevent test app in landscape mode will fail" into pie-cts-dev am: 453c6d2bea" am: 0a89080d32
am: 8591286995 -s ours
am skip reason: change_id Ibb4a0048c24131c7e7a395001dc97ea8ffdc4d35 with SHA1 da707b2ccb is in history

Change-Id: Ie8dd14ed083f065de98042dd876b21fe749930b4