Merge changes Ic31c996e,Icb1ec5b7,I94ebda3f,I64abf8c7,I4aef05de, ... into main

* changes:
  HWComposer: Add reconnect status to DisplayIdentificationInfo
  SF: use a switch for events in configureLocked()
  HWComposer: Display ID conflict resolution logic
  DisplayIdentification: guard EDID IDs with stable_edid_ids()
  DualDisplayTransactionTest: init ID vars via getters
  FlagManager: Move mInstance to getMutableInstance