Merge "Fix restore orientation for nosensor in folded state" into udc-qpr-dev am: bd33753f

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



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