Merge "Fix SystemUI compilation when Compose flag is enabled" into udc-qpr-dev am: 02f76c6177 am: 85879b2d1b

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

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