Merge "Update the permission check for dump" am: 32032cbfe3 am: 9192f34c81

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

Change-Id: Id4c40e177621f39174cd4cf6cd39cc40033302b8