-
(cherry picked from commit ffa69d85) # Conflicts: # lib/core/platform/pigeon_api_facade.dart # ohos/entry/src/main/ets/pigeon/HealthKitApi.ets # pubspec.lock
-
(cherry picked from commit 85d12a8b) # Conflicts: # lib/core/services/raw_data_service/platform_ios/apple_health_raw_local_notification.dart # test/core/services/health_raw_data_core_service_test.dart # test/core/services/health_raw_local_notification_test.dart