Revert^2 "Fix entry lookup in getDurationMs"

This reverts commit f7290ab8.

Reason for revert: Potential culprit for b/336419424- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If926a344e6949be3dffd9983146ae35d3b4161cf