Merge "Merge "Attempt to de-flake CtsUiRendering" into oreo-cts-dev am: 0b1f051d77"