Merge "Return current song id if active quene item id is not avaliable" am: aba2a8a4

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



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