f480cf371a
This reverts commit d511538361.
Reason for revert: Droidmonitor created revert due to b/367736714. Will be verifying through ABTD before submission.
Change-Id: I01281bd48c4ba7d07dc0308c504f21aad751ea44