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

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



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