am 96470fde: am c89a1774: Merge "Move SoftGateKeeper into gatekeeperd" into mnc-dev

* commit '96470fdefe16e2143ebab3b3ccbb7c2b375bd0ab':
  Move SoftGateKeeper into gatekeeperd