Merge "Do not set bugprone-branch-clone as error." am: 265530ed am: c2888662 am: 1b173423

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472



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