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

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



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