Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev