Merge changes from topic "am-bd60b3fda9634031a38927aec8b04229" into udc-d1-dev-plus-aosp

* changes:
  [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: fbb2488a -s ours
  [automerger skipped] Fixes foldable autorotation setting being out of sync in QS and Settings am: 435f835d -s ours am: cf40d184 -s ours am: 7fbe6965 -s ours