Merge "Wait for destoroying activities on EglConfigTest#testEglConfigs" into nougat-cts-dev