Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f4 am: 10f5f8dd" into oc-dev-plus-aosp