Merge "Update keep rules for SystemUI tuner package" into main