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