Merge "Fix SystemUI for dagger 2.47" into main am: 7507728a6c

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

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