Cache should vary on X-CS instead of X-Carrier

Currently varnish sets both X-CS & X-Carrier.
X-Carrier will be removed in 2 months.

Change-Id: I62c5055bb58aa9a3affcae15693719d42812f72b
Merge "Cache should vary on X-CS instead of X-Carrier"