Revert "[CDM][Refactoring 4/N] Move device presence logic out of..."

Revert submission 26624172-cdm-cleanup4

Reason for revert: Main suspect for b/330812093

Reverted changes: /q/submissionid:26624172-cdm-cleanup4

Change-Id: I04267bf9762e4e34763019528425f32d95f2fd41
20 files changed