[automerger skipped] Merge "Add guts to media player on long press" into...

[automerger skipped] Merge "Add guts to media player on long press" into rvc-qpr-dev am: 994c26d0 am: 46c190f2 -s ours

am skip reason: Change-Id I340e0b37393573f81a3bf12d5e453eccf5982473 with SHA-1 429360fb is in history

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

Change-Id: I7d11e5915922f200e6e96bf0ef03abab303604b2