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

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

Change-Id: I5f937570a060cc33af62635efa8ad0704ab053d2