Merge "Correct ActivityInfo constructors." into mnc-dr-dev am: cfea184d6c am: e2a49862c1
am: 8caf80d571

* commit '8caf80d571c37bc6fefd68227432fd49d76aaa93':
  Correct ActivityInfo constructors.