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

Change-Id: If85d881aafa3509263a9c00f653d4fb990001887