Merge "SystemUI: Add keep rule for VendorServices constructor" into main