Merge "If sink audio policy makes the device active for a call, then after...

Merge "If sink audio policy makes the device active for a call, then after call ends, resume previous active device" into main am: d551cf93 am: 1d158333

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



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