Merge "Fix SystemUI for dagger 2.47" into main am: 7507728a am: f3effa12 am: 4ae906f9

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



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