Merge "Correct ActivityInfo constructors." into mnc-dr-dev