Merge "Fixing the test as per GMS 7.0R4 requirements" into nougat-cts-dev