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

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

Change-Id: If55c2c50c43a3fcf507850b4d748c0c0c9a10899