am 5d5cfe83: am f5259a20: Merge "Fix VirtualDisplayTest by putting image checking task to an non-UI thread"

* commit '5d5cfe837ba8e986298078815dd30f397b7ce14f':
  Fix VirtualDisplayTest by putting image checking task to an non-UI thread