[automerger skipped] Merge "Spatial Audio: Fix display orientation, add fold...

[automerger skipped] Merge "Spatial Audio: Fix display orientation, add fold state" am: b9135401 am: 42bcd5f6 -s ours am: ea5228ef -s ours

am skip reason: Merged-In I6e824044a6ad79e17b7861e8fa57103902ab3320 with SHA-1 2490b2d2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2498478



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