[automerger skipped] Merge "Fix restore orientation for nosensor in folded...

[automerger skipped] Merge "Fix restore orientation for nosensor in folded state" into udc-qpr-dev am: bd33753f am: c635c722 -s ours

am skip reason: Merged-In I2692845f8f624d1bdf0d944dfb350b4bc0983081 with SHA-1 ea4e7618 is already in history

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



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