Fix conflict vendor proprietary Protocol and Discovery technology definition

Use protocol definition from .conf file in libnfc-nci instead of fixed value.

Change-Id: Ib8a74304974de3396a2f9cc644bce3dc07421f21
2 files changed