Merge "Don't rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev