92aef0d99a
This reverts commit bca368924c.
Reason for revert: Droidmonitor created revert due to b/404894013. Will be verifying through ABTD before submission.
Change-Id: If43e23bca9f7e62f26ee3c977cac643fcda3e3e6