Merge "Release MediaFrameworkTest wakelock in onPause" into jb-dev