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

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