Merge "[Notif] Rename/reset blocking helper stats file" into pi-dev
am: 1822926cfb

Change-Id: I69d4e83496f6088a58359e05c46dbe1c4bd9d117