am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom am: 8f5e775626 am: 49f944fb45

Original change: undetermined

Change-Id: I43022a44c0b6979272f3735d5b33cacb984b631e