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

Change-Id: I744a07a2ee10d287f4b38a1698da24e117938222