Merge "Spatial Audio: Fix display orientation, add fold state" into tm-qpr-dev...

Merge "Spatial Audio: Fix display orientation, add fold state" into tm-qpr-dev am: 85bc59b9 am: a0c5cfb6

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



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