Merge "Handle downgrading a runtime permission to an install one" into mnc-dev