Camera: Handle abandoned surface in finishConfiguration
am: 210ba5c4da

Change-Id: Id3cdefc396b0a391a5653250f5f8a7453e86843d