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

[automerger skipped] Spatial Audio: Fix display orientation, add fold state am: 203e69c4 am: 1f39eadc -s ours am: 3310812e -s ours am: 0cca9e81 -s ours am: 5884d10e -s ours

am skip reason: Merged-In If5c551cf606c514d0f1592598b49de00d1f269ea with SHA-1 7443f381 is already in history

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



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