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 am: 2418e0ac

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



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