Merge changes from topic "frame-drop-metrics" am: 8309e419

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



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