Merge "Fix rotation test on tablets" into udc-dev am: 894a842b am:...

Merge "Fix rotation test on tablets" into udc-dev am: 894a842b am: 899b6de7 am: 7e25fd8f am: 36b897dd

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



Change-Id: I645d060f85ca8f440e58ffbcc754f3dc3939d8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>