Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev