Merge "Fix rotation test on tablets" into udc-dev am: 894a842b77 am: 899b6de773

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

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