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

Change-Id: Ic3cbe67db2d913cc8d75572efbe2ab2e6c0e1faa