Merge "SpatializerHelper: fix null routing" into tm-qpr-dev am: 3c446e92 am: 651261de

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



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