am 5eab8c54: Merge change 7630 into donut

Merge commit '5eab8c543cfdfae0a1f18742e4e026bdaa948eaa'

* commit '5eab8c543cfdfae0a1f18742e4e026bdaa948eaa':
  b/1915565 Fixed ANR when snoozing or dismissing calendar notifications