This reverts commit a77d5ac126. Reason for revert: Droidmonitor created revert due to b/422782308. Will be verifying through ABTD before submission. Fix: 422782308 Change-Id: I00825e0f17a9a9e0d152ac8ebe767da3f267fbb1
a77d5ac126