Fix merge for OnDrawListener

Test: CTS tests for PixelCopy pass; without this
they time out as they never get the OnDraw call.

Change-Id: I6acced4699182b969f38a606a1314b2ffb38d760
1 file changed