am 599e09a0: am 1754351d: CameraService: Correct API2 error handling

* commit '599e09a0a559143a2337722e53e6e46cb5f6af3e':