[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: 19c2f87399 -s ours am: e89b23d367 -s ours am: 1b3765d00c -s ours am: 82c362963a -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: Ic7d9fd0dccbe351b6318be6a2252b18f0200f230
tree: 25178dc140db8c808e41967408c06f3e795396ed
  1. framework/
  2. OsuLogin/
  3. OWNERS