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 am: 921ffcd5 am: 0c748a84

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



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