[automerger skipped] Merge "DO NOT MERGE Moved contents of clang_cflags into cflags" am: e6e863b0 am: f3aec57d -s ours am: 04ee59dc -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2069670



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