[automerger skipped] [automerge] Fixes foldable autorotation setting being out...

[automerger skipped] [automerge] Fixes foldable autorotation setting being out of sync in QS and Settings 2p: 435f835d am: 5cf3343c -s ours am: 750168f2 -s ours

am skip reason: Merged-In I3f28027d5e24796ceb01fc1eb164aac8814a1753 with SHA-1 435f835d is already in history

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



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