Merge "ProcessStats: fix uss average value offset" am: b355b7f446
am: 10f5f8dde5

Change-Id: I213eef696c40c0260b32c71fac18b1e5063dc77d