16bcecc4e8
This reverts commit 50c33f271e.
Reason for revert: <Droidmonitor created revert due to b/401425778.Will be verified through ABTD for standard investigation.>
Change-Id: Ie3d9508864f51572307f9a16ddb14dc86b9d57ad