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

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



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