[conflict] Merge "Skip Size Compat mode when orientation change comes from...

[conflict] Merge "Skip Size Compat mode when orientation change comes from app" into tm-qpr-dev am: 11231f40 am: 19ab48cf

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


Fix:272471990

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