[automerger skipped] Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637 -s ours
am skip reason: Merged-In I48806533e4e705d2d9be45f3b3d3931d9294b167 with SHA-1 7474f67454 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14885895
Change-Id: Ib8134fe3a3e4a717e9ce2a794a3f3b039967aec8
This commit is contained in: