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

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



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