clean up / rename stuff, and remove logic that wraps the encryption key twice
clean up / rename stuff, and remove logic that wraps the encryption key twice

dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android