Merge "Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f4" into stage-aosp-master am: e62a5fc7" into oc-dev-plus-aosp