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

This reverts commit 10fcbd0ad33e7d552c64876ead0850e4990f1aaf.

Reason for revert: Droid-monitored triggered revert due to likely culprit for breakages in b/329682644, b/329697378. Will be verifying through ABTD for confirmation and before submitting the revert.

Change-Id: Ia900b37eb149ece51647e7e0710751bfb02f854e
19 files changed