Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c
automerge: 60a6110

* commit '60a61108b9777fa557a8cfbd8e2ad25a76451c01':
  Revert "improve TestVirtualDisplayRecycles to reduce memory usage"