Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev