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