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

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

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



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