[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -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: Ie77013e116fe7669104d446e7ebc679aacd7e1b5
tree: 07ca228c0468a12e3d09e933bcc8cc5331ccc426
  1. framework/
  2. OsuLogin/
  3. OWNERS