Merge "codec metrics for resource reclaim" am: 75657297 am: 3e1d0a33 am:...

Merge "codec metrics for resource reclaim" am: 75657297 am: 3e1d0a33 am: 372a252c am: a7e55fe8 am: d92e4b98

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



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