[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network...

[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48c -s ours am: e83871ae -s ours am: 7681aae0 -s ours am: a580cdd0 -s ours am: 45f2c24d -s ours

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

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

Change-Id: I51b6648c373639a0c9e4d64e2b26736f47038278