Merge "Stop StkAppService when no CatService is available"
am: e3fb871d1e

Change-Id: Ic7f0b355d6624c23a166392e084419bf18cf6cc2