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

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



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