Merge "Fix ActivityManagerAmProfileTests"