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: 86f7e19b am: 6286b43d am: 7a4cb5d3 am: 34f9c4ff

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

Change-Id: I39d2786cd4478ecb42e1b33e8b429fe3bb99998a