Merge "Dump tcpdump on failure in testUidTagStateDetails" into main