Merge "Fix issue #11087316: Can't run dumpsys procstats on user builds in some cases!" into klp-dev