[automerger skipped] Revert "Revert "Update IMSI protection notification flow"" am: c8fffc4ce9 -s ours am: 6de25b34bc -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: Iddb007feb944490b0b9d7861c844b2d67293d548
tree: 5eaf386c1eb38f5d7e90b567071fce0f5c7b3f2a
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg