Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
am: dc09b3ff49

Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7