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

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



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