Merge "CameraService: Logcat conflicting devices on rejected open" into mnc-dev