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

Change-Id: Ie3a141c86be93eb0ff9d5f5e4db899af3e20a455