Merge "Add hidden API to retrieve ActivityInfo"