Merge "Add NonNull annotation in ActivityManager."