Merge "Fix issue #78138020: Improve app ops dumpsys" into pi-dev am: 1074688a26
am: 09a3c85edc

Change-Id: If371b7290c0374b4e8ef9421a5459c625dc5400f