[automerger skipped] Merge "Update Spatialization and HeadTracking AIDL usage" into main am: 00e9623bf7 -s ours am: ff5fd95859 -s ours

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

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

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