Revert "Clean up fully rolled out PermissionMigrationForZeroTrus..."

Revert submission 28993807-hdop-cleaup

Reason for revert: Droidmonitor created revert due to b/363275535. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28993807-hdop-cleaup

Change-Id: If36c509360b592bd551cb70f92235814488b9805
2 files changed