Merge "Fix MediaSessionManagerTest#testSetOnVolumeKeyLongPressListener" into oc-dev