Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9  -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8  -s ours am: d837fd83a6 am: 543d7125fb am: f1cd94133f
am: 605631e0da

* commit '605631e0da2f59ca8ded21ec4ab1bf4b0a5f2a3c':
  DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage