Merge "Make suspend_prop system_vendor_config_prop"