Merge "Consolidate bluetooth address variable" am: 58e885b2 am: 8d74c9cc

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



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