Merge "Prevent double-counting of kernel stack size in dumpsys reports" am: 9493f0ed0b am: a457a78ab7

Change-Id: I5454c8a0c92bd8b25956cf96b987199fffe3a898