[automerger skipped] Merge changes from topic "frame-drop-metrics" am:...

[automerger skipped] Merge changes from topic "frame-drop-metrics" am: 8309e419 am: eb9b87e5 -s ours am: b571e7d2 -s ours am: 5248a4ca -s ours am: c37489ea -s ours

am skip reason: Merged-In I5f1229ab2f6254fe0e581e5c4bc401bae048242a with SHA-1 932bf60d is already in history

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



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