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

Change-Id: I1d67c1f2cdaa28063110454592cf7306ecb7bcd2