Merge "Use the right packagename for Wear SystemUI in FlagsManager" into main