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

Change-Id: I80156aebfba5f0a8e914163b420a2676658e9826