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