[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: 19c2f87399 -s ours

am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 d98eeda694 is in history

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

Change-Id: I0af07680e4f6f4eb8c28227033682b201fec7421
tree: bb7576cb8870e257ab530898fc614d9430e518e1
  1. framework/
  2. OsuLogin/
  3. OWNERS