Merge "Fix/suppress bugprone-branch-clone warnings" am: 55d91e6a am:...

Merge "Fix/suppress bugprone-branch-clone warnings" am: 55d91e6a am: 378fc2d0 am: a910fba9 am: 729c0d2d am: b90e86f5

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



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