Split autoAdd into catchall and group specific settings

This allows a tool to be more specific about the situations in which it
should be auto-added.

Change-Id: Ic353f91a4303a513e3b3daaed9cf5d0234396456
Merge "Split autoAdd into catchall and group specific settings"