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

am skip reason: subject contains skip directive

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



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