Camera: Fix a wrong erase call for app segment buffer

Also make sure the pending frame number is also removed in the error
case.

Test: vendor testing
Bug: 159197773
Change-Id: I3f9ba90d0b9335e99283bbafbd635d3eaebf2275