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

Merge "Return current song id if active quene item id is not avaliable" am: aba2a8a4 am: 78b2a922 am: 84792238 am: 76599f9e

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



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