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

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



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