[conflict] Merge changes from topic "frame-drop-metrics-tm-qpr-dev-plus-aosp"...

[conflict] Merge changes from topic "frame-drop-metrics-tm-qpr-dev-plus-aosp" into tm-qpr-dev-plus-aosp am: fd3b822d

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



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