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