[automerger skipped] Merge "Send onFrameRendered differently depending on...

[automerger skipped] Merge "Send onFrameRendered differently depending on whether the surface is a display" into udc-dev am: 06f98204 am: c9ee2dd9 -s ours

am skip reason: Merged-In I35f1e8a844d9a96b04d8c6b2c00881e7ec09f98d with SHA-1 e4f38afb is already in history

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



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