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

Change-Id: Iab0568f6dde4b247480b1fc259d3e65e50074cd9