[automerger skipped] Revert "Revert "Update IMSI protection notification flow"" am: c8fffc4ce9 -s ours am: 711851e45f -s ours am: e4e099cdcd -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: I8ca14650e23981a035cf068e1843e129d154c236
tree: 74d10995c161d3aecae2b4dc7ea6ee7e2a162378
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg