[automerger skipped] Merge "Fixes foldable autorotation setting being out of...

[automerger skipped] Merge "Fixes foldable autorotation setting being out of sync in QS and Settings" into tm-qpr-dev am: b8dfb743 -s ours am: aa428112 -s ours

am skip reason: Merged-In I3f28027d5e24796ceb01fc1eb164aac8814a1753 with SHA-1 470c64f7 is already in history

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



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