Merge "Fix the issue of being unable to jump to app notification settings" into main am: a1ffa91bec am: 7b16dd10f8 am: a3869deb33

Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2869936

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