[automerger skipped] FastPath: More clang-tidy optimizations am: fd18f3c2...

[automerger skipped] FastPath: More clang-tidy optimizations am: fd18f3c2 am: 5f529fa8 am: 1a83bfa0 -s ours

am skip reason: Merged-In I4b5570bcbe3d4c3df890d87f547bab1de3c62187 with SHA-1 87e740a6 is already in history

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



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