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

* commit '73c024cb70e74a20e75bc04ea1a7b85256505329':
  Revert "improve TestVirtualDisplayRecycles to reduce memory usage"