Merge "[automerger skipped] Merge "SpatializerHelper: fix...

Merge "[automerger skipped] Merge "SpatializerHelper: fix canBeSpatializedOnDevice NPE" into tm-qpr-dev am: e455bc8e am: 9b235a80 -s ours" into udc-dev am: 7b05ea66 -s ours

am skip reason: Merged-In Ib6d73fec4d57cf372361762b5c1d85329794de92 with SHA-1 d5026e8c is already in history

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



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