Merge "Optimize swapchain OOM tests" into nougat-cts-dev