Revert "[CDM][Refactoring 3/N] Consolidate association cache and disk"

This reverts commit 50e4edd16947edabaeb168bbdf778d4a53093ad7.

Reason for revert: Droid-monitored created revert for likely culprit for b/329886670. Will be verifying through ABTD before submitting the revert.

Change-Id: I1cc4ad986ea1c6259712b41751e631a454069e61
19 files changed