Merge "AudioService: persist/restore audio device spatial audio settings" into...

Merge "AudioService: persist/restore audio device spatial audio settings" into tm-dev am: 11782ee9 am: 7f75f8a3

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



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