am 6a7fdbdd: (-s ours) am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev

* commit '6a7fdbdd':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"