Merge "Injecting data stall event to statsd" am: 2fd3ca6fa0
am: 853d1ae5ac

Change-Id: I451e06af811d46ff48bc82326e8dd19a3a2e7a7b