[automerger skipped] Merge "Disable the spatializer options for device...

[automerger skipped] Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222 am: 4ee43c40 -s ours

am skip reason: Merged-In I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e with SHA-1 92fb7bdd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690



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