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

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



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