Merge "Don't try to connect camera service if it is disabled." into cw-f-dev
am: cfb81966d1

Change-Id: I8cd1dd7bb97186379f02f906f0d64133fd3defef