am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev
am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev

* commit '683e3cfef17bb1a80d7c387200ac491e663d5af2':
  MediaController: Keep the controller when touch exploration is enabled

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base