Merge "TrafficControllerTest: improve error declaration in dumpsysInvalidMaps"