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: add43e1e

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



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