Merge "Using inline definition of FrameDrawingCallback instead of lambda as it fails on some devices" into rvc-dev am: a38a553c16

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

Change-Id: Iff285ce5dfe6c8494bd7fb66d12bf67bc0a4e52f