Merge "Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable" into cw-f-dev am: d752f11926
am: af323945f1

Change-Id: I0abbe2e311acc799c53cc43f19052f76159d495b