Merge changes I35adedc8,I81a55941,I429e3f7c,Iac0d5bbf,Ic4ef21b9 into main

* changes:
  Rename NotificationEntry.isAlerting to isHeadsUpEntry
  Rename BaseHeadsUpManager runnables without reference to alerting
  Rename HeadsUpEntry add/removal without references to alerting
  Rename BaseHeadsUpManager.isAlerting to isHeadsUpEntry
  Rename BaseHeadsUpManager.mAlertEntries to mHeadsUpEntryMap