This reverts commit 70b9ac0ddd. Reason for revert: Droidmonitor created revert due to build breakages in b/352582602. Change-Id: I8a8e38ccf3e715e9b4746ac333aed0cc13d11969
70b9ac0ddd