Merge "setConnectionPolicy now calls connect or disconnect based on the passed...

Merge "setConnectionPolicy now calls connect or disconnect based on the passed in connectionPolicy, clean up connection logic in AdapterService to no longer call both connect and setConnection policy as well as remove references to PRIORITY_AUTO_CONNECT."
am: 9a725f37

Change-Id: I04b04caa4657393aaa7d83077c566638df54b9fe