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

* commit 'e2a49862c147161292b802d70070b7f6c91cca00':
  Correct ActivityInfo constructors.