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