[automerger skipped] Merge "Bugfix: Allow shortcut and widget services to...

[automerger skipped] Merge "Bugfix: Allow shortcut and widget services to update shortcuts and widgets across all launchers during archival." into 24D1-dev am: e7a400e9 -s ours

am skip reason: Merged-In I6bdfddb889a80e698e9d62bf32022e4f59b0245a with SHA-1 c3ba6cb0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26476215



Change-Id: If1d4da1cf714d8dc55c5bee3efb41880af0d1403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>