[automerger skipped] Merge "SpatializerHelper: fix null routing" am: dddba4569f am: 262fca259c am: d014236ba3 am: 7090e57907 -s ours

am skip reason: Merged-In I263b55565c3c30ee999b7d8513263e0d2e7e76fb with SHA-1 9c72bef73d is already in history

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

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