This reverts commit 4b68ad6e8d. Reason for revert: <Droidmonitor created revert due to b/385827654.Will be verified through ABTD for standard investigation.> Change-Id: I0fbdcd276c9e20010b3bfbbcad5203bf276859a4
4b68ad6e8d