[automerger skipped] Merge changes from topic "frame-drop-metrics" am: 8309e41946 am: eb9b87e5b1 -s ours

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

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

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