This reverts commit aecb2b65ba.
Reason for revert: Likely culprit for b/430219293 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Bug: 430219293
Change-Id: I9b786abf784de8c34b9f517236305330b79b227e