[automerger skipped] Merge "Fix clang-tidy errors in sounddose directory" into...

[automerger skipped] Merge "Fix clang-tidy errors in sounddose directory" into udc-dev-plus-aosp am: bc177913 am: 6ac3a106 am: bdf2989b -s ours

am skip reason: Merged-In I0b4ed24ed28ad423f82dd1db8813d2aff31bef9d with SHA-1 f2cf6747 is already in history

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



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