Merge "Default libnfc-nci.conf for GSI" am: 0f7506c92d
am: 4d2156251f

Change-Id: I161e0c90de8bd325a8fe7afbd91cd8acac113016
tree: bca0a7bf7d949d3f76547eda1fd0912d88449643
  1. bluetooth/
  2. nfc/
  3. vndk/