Merge "Support for NFCC reports different protocol with same discovery ID" am: a9d801c5c7 am: 3ba0b4e58c

Change-Id: I059448f66b14c854a383aa421c60f5506eb0b574