[automerger skipped] Merge changes from topic "spat_audio_types" into...

[automerger skipped] Merge changes from topic "spat_audio_types" into udc-qpr-dev am: e0db7b76 am: f857b88f -s ours

am skip reason: Merged-In Ia935b3644e5909c88457190f975ec1a01180a1fc with SHA-1 d389c910 is already in history

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



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