am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant...
am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '81f3a85a':
Fix issue #22940169: "pm grant" can no longer grant permissions...