Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446" into stage-aosp-master
am: e62a5fc7d3

Change-Id: I1c87dc82499ac1a53ba3a6c14d79586b4d7db986