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