[automerger skipped] ConnectToNetworkNotification: Disallow connect from lock screen am: ccc5c860f2 am: d4ad028561 -s ours

am skip reason: Change-Id I760cd4303b846a214737edc49254f6327e05d357 with SHA-1 5467edf5a2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/13146870

Change-Id: Ie0959684aeefe8b9f051dd67ce8c91c374f24cf4
tree: 6de9ab9927d07438c2b36f3eddcab5c9dc9dbf1c
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg