Merge "Merge "[SurfaceFlinger] Callback to renderengine when erasing BLAST buffers" into qt-r1-dev am: 9939d091ec am: b453a500e9" into qt-qpr1-dev-plus-aosp