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

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

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



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