[automerger skipped] Merge "Update Spatialization and HeadTracking AIDL usage"...

[automerger skipped] Merge "Update Spatialization and HeadTracking AIDL usage" into aosp-main-future am: 96c34f6f -s ours am: 01d80943 -s ours

am skip reason: Merged-In Id5b2ffba2131aebf0ec6656511f2f10f79db7567 with SHA-1 e2350225 is already in history

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



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