This reverts commit 09d569ecde. Reason for revert: <Droidmonitor created revert due to b/352465601. Will be verifying through ABTD before submission.> Change-Id: Ia71e697e180b569480be9f029d9e729f42d5f855
09d569ecde