Revert Echo user notifications trim job backport

Change-Id: I5e321d06fbe8e52e423f203472127bbf6efa05dc
Merge "Revert Echo user notifications trim job backport" into wmf/1.25wmf1