am ff8018dc: Merge "Fix NFC permission." into gingerbread

Merge commit 'ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp

* commit 'ff8018dcbd0488160519481d4ca1567fa397d44e':
  Fix NFC permission.