Merge "Add Wifi stats to telephony bugreport" into pi-dev am: ef4c9b64ad
am: 500d7e11a2

Change-Id: Ib3b257d2029835ec0beb393c1832ae6e829a4e81