Merge changes from topic "revert-13329427-revert-13274595-XTPTORCRLV-WLDUPFEJWD"

* changes:
  NetworkControllerWifiTest: Fix unit tests
  Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."