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

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



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