Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I1cd0d5563416630dac3baa769c96b40838a5e9b8