Merge "Keep track number in sync when playlist has the same song many times" am: 86f7e19b6d

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

Change-Id: I0dd43371be167774311d93d061a72cd35508b734