[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "spatializer_device_state_update" am: 5737af43 am: 19113c77 -s ours am: f67ca498 -s ours

am skip reason: Merged-In I3cb4d30efbdab98d078e68a8ac6a85faee2dd8d9 with SHA-1 0ea3e2b9 is already in history

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



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