This reverts commit c414adbf32c8df53265844b51d0d75e500300527. Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/263437450 Change-Id: I3badfa6fd35fde19c199d71894124212edaf7dc8
This reverts commit c414adbf32c8df53265844b51d0d75e500300527. Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/263437450 Change-Id: I3badfa6fd35fde19c199d71894124212edaf7dc8