Merge "Use framework-res keep rules for system_server"