[automerger skipped] Merge "Update Spatialization and HeadTracking AIDL usage" into udc-qpr-dev-plus-aosp am: 7979c435ba -s ours

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

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

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