Merge "Keep track number in sync when playlist has the same song many times"...

Merge "Keep track number in sync when playlist has the same song many times" am: ea631435 am: 2d68ce1e am: cb0f71bb am: 533c3a4c

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

Change-Id: I39d2786cd4478ecb42e1b33e8b429fe3bb99998a