Merge "Data plan setting in SystemUI quick settings." into oc-mr1-dev
am: 56eec29494

Change-Id: I4cf9310cbfb8a6aec263d351dcbba83771b68455