Merge "Add MANAGE_WIFI_INTERFACES to the shell permission" am: dc2f8bfaee

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

Change-Id: I14fc54df18fc014c789f52f9147f7e7ccfb40ad7