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: I2baaaf7a64883e1b686cae0a658a384cff456382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>