Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS" am: dbe634a784 am: 93be545cde

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

Change-Id: I6b801218b1f79bfb456f6a0fefa0592594c33085