Merge "Remove the sender package filter from the intent firewall" into jb-mr2-dev