hevc decoder: avoid access iterator after erase from map am: 1c89a33efb am: 8a1acdc56e am: d299a95119

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

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