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

Merge "Fix rotation test on tablets" into udc-dev am: 894a842b am: 5577d0fe am: 6b194c5c am: b74b8cff

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



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