Merge "Add skip_jarjar_repackage: true to SystemUI-core" into main