Merge changes Ic577e8d8,Id81c6363 into main

* changes:
  Adds new UiEvent IDs for hearing devices dialog
  Fix HearingDevicesDialogDelegateTest failed