This reverts commit 922c6a5e. Reason for revert: Platinum+Droimonitor revert for likely causing b/266163554 Change-Id: I3192c2722735d9f232d19f629e5ca57c0cadd6f9