Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb