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

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

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



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