Merge "[Notif] Blocking helper basic metrics" into pi-dev am: d53c5bb4f3
am: 67624094c9

Change-Id: Ic0a267fcc0289b41046c79349535278dfa72836b