Merge "Fix memory leak in metrics handling during error" into udc-dev am: 073d0dc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21743019



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