Merge "Add drm and kernel permissions to mediaprovider" am: 224b4eac am: 34b76844 am: b0e13e81 am: 1c5ea06a Change-Id: Iadc8b0d884e69506e47855327f54027f7050387f