am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev

* commit '6e2fb78fbe3ce50182f0ad928748aeada57a44cf':
  Implement some control over ALLOW_WHILE_IDLE alarms.