Merge "Fix the command problem "adb shell pm list permissions -f"" into...

Merge "Fix the command problem "adb shell pm list permissions -f"" into udc-qpr-dev am: 43a52ec8 am: c9fa83fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24825387



Change-Id: I21002078173f86f6f378782058bafbdde6d648e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>