Merge "CameraService: fix camera removal paths" am: 930c980043
am: 1f1584afba

Change-Id: I0581b0b0a4d44c941d5617de8d746a99da38761a