Camera: Handle abandoned surface in finishConfiguration am: 210ba5c4da
am: 491926c8c6

Change-Id: I2408403683f807e097e25732b4596cef1cbb9390