Merge "Clean up the use of special defined const" am: 31086b05 am:...

Merge "Clean up the use of special defined const" am: 31086b05 am: cb7da3c7 am: 3118d511 am: 78d05271

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



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