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

Change-Id: Ia01e3b927944a505424053d1cf090dbe971d48bb