Merge changes from topic "spat_audio_types" into udc-qpr-dev am: e0db7b76c4

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

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