Merge "Refactor code to prepare for user switch delay" am: 73f51cd9

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



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