Merge "Consider requested orientation for snapshot compatible" into tm-dev am:...

Merge "Consider requested orientation for snapshot compatible" into tm-dev am: 17bfd524 am: d5215310

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



Change-Id: I64384cd8325d8b61a3e2dcd58438b016287a9ea1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>