Merge "Update the permission check for dump" am: 8df8f29f8b am: 1e46f3f547

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

Change-Id: Id4c40e177621f39174cd4cf6cd39cc40033302b8