Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am: 0c0fd0375c
am: 01d6fb2c9c

Change-Id: I7a2399498f7f234a09545107b0fdda3cade6ee30