hevc decoder: avoid access iterator after erase from map am: 1c89a33efb am: a333f9216c am: 7abc6bb628

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

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