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

[automerger skipped] Merge "Send onFrameRendered differently depending on whether the surface is a display" am: 9c45deea -s ours am: ccbfe283 -s ours

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

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



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