Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637

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

Change-Id: Id07bf1a5714a717176d003758fdf9b31fde0833a