[conflict] Merge "Rename SystemUIComposeCore to PlatformComposeCore (1/2)"...

[conflict] Merge "Rename SystemUIComposeCore to PlatformComposeCore (1/2)" into tm-qpr-dev am: 62a83980

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



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