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