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

[automerger skipped] Merge "Send onFrameRendered differently depending on whether the surface is a display" into stage-aosp-master am: c2778bdb -s ours am: f1d4f36d -s ours

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

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



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