am 31038903: (-s ours) b/3019621 Collapses AlarmScheduler threads. Do not merge

Merge commit '310389035e8e7b607823325230c40220ac2dab60'

* commit '310389035e8e7b607823325230c40220ac2dab60':
  b/3019621 Collapses AlarmScheduler threads. Do not merge