Revert "DecryptHandle cleanup"

This reverts commit e75d74c70f125bddeb36e175de77e3b0461d1e48.

Test: Local build completes
Bug: 144814133
4 files changed