Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev