hevc decoder: avoid access iterator after erase from map am: 1c89a33efb am: 8a1acdc56e am: d299a95119 am: e405dba8f8 am: ee8b4ee492 am: a3b55c3c4c am: 28139bb7f6

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25532478

Change-Id: Ie624126feafdd334b156cdc8cb0230037429e7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>