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

Change-Id: I2f4b53bbcc9d8f3a6865405a6ac764f2f50a9395