Merge "Add isNullCipherAndIntegrityEnabled HAL API"