Merge "Fix the DSU notification behavior" into main am: 24ea590c05 am: 0d74c67028

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

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