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

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