Merge "Fix the command problem "adb shell pm list permissions -f"" into udc-qpr-dev