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

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