Merge "CameraService: Handle ActivityManager death for UidPolicy" into pi-dev