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