Merge "Remove duplicated test" into nougat-cts-dev