Merge \"Prevent notifications from erroroneously bypassing \'repeat callers\' filter\" into nyc-mr1-dev
am: 9c3d64caef

Change-Id: I5fbe9d0c5da7084cede75aaaa57255844d836661