Merge "Spatializer: Fix lost settings after reboot" into tm-qpr-dev am: a22527d9 am: 37a9a021

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



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