am 40eade14: Merge from open-source master

* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
  Fix crash by "adb shell pm list permissions -f|-s"