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

Change-Id: Iee4fd978316b2af3f950acb1edb00d85f8b19d32