[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905
Change-Id: I65977552f542d70e0b5c33ee8ddfd245f01593c9
This commit is contained in: