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

Change-Id: I36233e8a9e98b1a60e81ccb729868cb3e45b4590