am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1

* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).