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

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

Change-Id: I5b8abd45829d7547d094714442015c52ab0472e4