This reverts commit 25e9e900f1. Reason for revert: Droidmonitor triggered revert due to build breakage in b/348142863. Will be verifying through ABTD before submission. Change-Id: Ia18f83e9261e395cf5f76669523bd6f4a5e9ba49
25e9e900f1