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: I89127e1c6e445adb21dbf96c6bbbec8935bf6296