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

Merge "Consider requested orientation for snapshot compatible" into tm-dev am: 17bfd524 am: 05ea0373 am: b96eadd5 am: e9f9bb00

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



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