This reverts commit 8b82086722. Reason for revert: Metrics no-longer needed, we are adding compat for this. Bug: 187153492 Test: N/A Change-Id: I31bbe36378a2da969a094405b0e0a7b7b9cde3a0
8b82086722
c36995ec84
cf5f4d6cbf
9c975f2335