Merge "Remember original orientation in size compat mode." into tm-dev am:...

Merge "Remember original orientation in size compat mode." into tm-dev am: ae90fa2e am: d1c33837

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



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