am a585eb17: am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread

* commit 'a585eb17aba237b6de393b9fb88e03b996cb63c1':
  NfcAdapterExtras: reset singleton state if initialization fails.