Merge "Fix issue #78138020: Improve app ops dumpsys" into pi-dev