Merge "Fix issue #122604613: Fix appops dumpsys"