Merge "Test should handle both device orientations" into sc-v2-dev am: 2f48e697 am: 3cbca333

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517448

Change-Id: I187363eec9d61b6c4f08fde691d6cae8e44bf907