[automerger skipped] Merge "Fix PlaylistPerformanceTest#testDeletePlaylistMembers" into mainline-prod am: 43523b49e8 -s ours

am skip reason: Change-Id I2ee1dfba870058126c9c87859eb4ef3da6532ea2 with SHA-1 dcb627601d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13219705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I934fad7ecb5306ed0d49981db47e9be6dbe4711a