Merge "[Media ML] Sync with original implementation" into rvc-dev am: 018afaae7c am: 68f269d717

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

Change-Id: I5dc8d5319e349d63a8801ea4c0cbf7d20c693330

services/core/java/com/android/server/media/MediaSessionService.java

@@ -2572,6 +2572,9 @@ public class MediaSessionService extends SystemService implements Monitor {
                     }
                 } else {
                     if (mKeyType == KEY_TYPE_VOLUME) {
+                        if (isFirstLongPressKeyEvent(keyEvent)) {
+                            dispatchVolumeKeyLongPressLocked(mTrackingFirstDownKeyEvent);
+                        }
                         dispatchVolumeKeyLongPressLocked(keyEvent);
                     } else if (isFirstLongPressKeyEvent(keyEvent)
                             && isVoiceKey(keyEvent.getKeyCode())) {