Merge "Don't check for UPDATE_DEVICE_STATS if the caller is the system server."
am: c2db59afb2

Change-Id: Ia25d33f116bcecd13d23a1a1cab1fc9e3225e6b6