Merge changes Ife0b17c2,If37e5c6c into mainline-prod

* changes:
  Remove dead code for AnomalyAlarm
  Remove alarm manager dependency from anomalyalarms