Merge "Improved notification interruptiveness calculation." into pi-dev am: 4da6e1f3b0
am: 63257f50b5

Change-Id: Ia8f3ef78d801759c8fae8e76f2838609ef861e55