Merge "Rename persist.nfc.uicc_enabled to persist.vendor.nfc.uicc_enabled"
am: 24953f8d9c

Change-Id: I90271087f365481e84aa1ed49ac0bde64f112494
tree: 4b66338e1d9fc7a1e1f18b60486e1ddf094124d8
  1. private/
  2. public/
  3. vendor/
  4. crosshatch-sepolicy.mk
  5. OWNERS