This reverts commit 608779b224. Reason for revert: Droidmonitor created revert due to build breakages in b/362287839. Change-Id: I6ff96539ae714698692794209d8e76e6062378b0
608779b224