Merge "Merge "Using inline definition of FrameDrawingCallback instead of...

Merge "Merge "Using inline definition of FrameDrawingCallback instead of lambda as it fails on some devices" into rvc-dev am: a38a553c am: b5e88fa6" into rvc-d1-dev-plus-aosp am: 4cee3354

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

Change-Id: I536c5c1f8606ead14a6cb9d16352feb5eabd0b60