am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
automerge: 1cc57ab

* commit '1cc57aba8128134f55b6d5e4f4800c51e3472828':
  Fix "pm list permissions" crash if resource string missing