Merge "Enable new data usage settings features." into pi-dev
am: 024cf8a707

Change-Id: I73da0aa1526652ed470bab9f4230149ab9b7c32b