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

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

Change-Id: I30705a0db0969c8bafbaa827761a25aca815d455