Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99