Merge "Revert "Add constants for setNullCipherAndIntegrityEnabled""