Merge "Fix vold vulnerability in FrameworkListener"