am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit 'c03de65abdee1c35fe64fd4194ece8a14d0937fe':
  Dont use isPotentialEmergency for our emergency logic.