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

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



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