Merge "[DPP] Add _GENERIC suffix to EASY_CONNECT_EVENT_FAILURE code"