This reverts commit d21b78c1. Reason for revert: Broken MediaMetricsAtomTests tests Bug: 191136205 Change-Id: I8187d7f104115f8935fc0eaa0ee8ffcdca393609