This reverts commit 44db75e814. Reason for revert: Droidmonitor created revert due to b/352465601. Will be verifying through ABTD before submission Change-Id: I47918f16fbc5745758abf906017c68ef95a708f4
44db75e814