am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo

Merge commit '7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken

* commit '7ecf08faa9da7d372dd319aac8b1e5760a116601':
  Add emergencyOnly indicator in ServiceState.