Merge "Whitelist new CHANGE_OVERLAY_PACKAGES permission"