Revert submission 27917806-v_hal_migration_phase3
Reason for revert: Droidmonitor created revert due to b/350390759. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:27917806-v_hal_migration_phase3
Change-Id: I466c1b61b86cb7a87f5a1a5ffbc0b4a86438beea