recovery_keys: Remove deprecated code and cleanup
Merge branch 'cm-11.0-ion' into cm-11.0-caf