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

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

Change-Id: Ic8243b12ebed20e1e392acc2a5be52a09b857582