Revert^2 "Fix check for whether a trace tag is enabled"

83483148c38b18110a4beec5dd554e9beed74ccb

Change-Id: I9e37dbb1e6396a8456c57df68932c96dc289d804
Bug: 330172681
2 files changed