[automerger skipped] Merge "Spatializer: Fix lost settings after reboot" am:...

[automerger skipped] Merge "Spatializer: Fix lost settings after reboot" am: eb72e5ee am: ee5e9baf am: ffb0d032 am: 640b15a3 -s ours

am skip reason: Merged-In I68e31377c8cbeab3df5c7924afb7277bf8a30dcd with SHA-1 8e10acae is already in history

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



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