Merge "AdapterService: Handle snoop settings changes"