am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread

* commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)