Merge "Allow configurable data warning for BillingCyclerPreference" into nyc-mr1-dev am: f1e87a2003 am: 3800b74013
am: d254d188e0

Change-Id: Iff91f7b589fefe936338ad68dad908d995867fc8