am d9e98a4b: Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev

* commit 'd9e98a4b6d3181ab3d58b7781ee2f88a389ecf1f':
  Unhide BIND_NFC_SERVICE permission.