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: 20d19173

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



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