[automerger skipped] Merge changes from topic "fix-218273231-spatial-latency"...

[automerger skipped] Merge changes from topic "fix-218273231-spatial-latency" am: 095598af am: 3fcdf521 am: ff873460 am: 94dfac57 -s ours

am skip reason: Merged-In Ia78156d1e190bb49a67988567df066c1ab90f9bd with SHA-1 ee398adb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2208080



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