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

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



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