Merge "Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446" into stage-aosp-master am: e62a5fc7d3" into oc-dev-plus-aosp
am: f9d61556b6

Change-Id: I77a2e1556bae4cc46907e1862ffe5e9585b68394