This reverts commit 1685969e60. Reason for revert: Droidmonitor created revert due to b/367330939. Change-Id: Idd70cf3d846fad1a25060ebfb6ae6a99599fd861
1685969e60