[automerger skipped] Revert "Revert "Update IMSI protection notification flow"" am: c8fffc4ce9 -s ours

am skip reason: Change-Id I8be7c1b9e66162fdd244946b47367290116a7747 with SHA-1 024aad2e07 is in history

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

Change-Id: I9b3edf662588265047a851bcb8168662b7c92d14
tree: 2d8d5b23fd3874a2dba1c233f2dde925d33ab443
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg