[automerger skipped] Merge "Media - Add player sorting" into rvc-qpr-dev am:...

[automerger skipped] Merge "Media - Add player sorting" into rvc-qpr-dev am: 0d6e0d8e am: b9523042 -s ours

am skip reason: Change-Id I07d0219523289fc8c5950d078bd0960bbdb1cc37 with SHA-1 642eae6b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12410202

Change-Id: I0618a8ca86ae1d00219d0f42a4f7da64330af9b6