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

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



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