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

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



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