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

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

Change-Id: I9356201e6a6817e3ab69c196e2f86ab622cc4c53