Merge "Fix/suppress bugprone-branch-clone warnings" am: 55d91e6ae2 am: 378fc2d027 am: a910fba924

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

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