Merge "Merge "Fix rotation test on tablets" into udc-dev am: 894a842b am: 899b6de7 am: a60c4a39" into udc-qpr-dev-plus-aosp am: 25c7c710

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



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