[automerger skipped] Change flag for client bit mask am: 2b60980e am:...

[automerger skipped] Change flag for client bit mask am: 2b60980e am: c9eeba67 -s ours am: 83fdefea -s ours

am skip reason: Merged-In I2910ab5f4fb7e6cd30991668ef6e4dd032a2a9b9 with SHA-1 67c4bdea is already in history

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



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