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

Change-Id: Ia97ce84c1b954fcfd0a15743071e968492e40221