Merge "Add a hidden API to set trace tag on atrace counters." into main