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

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



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