Merge "Add VTS for setNullCipherAndIntegrityEnabled"