[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: I0e6a5cce296cd0b5ab3390da098bd1e794523df0
tree: 16df9aa1c941fa507829f88fdb571b4c47bf1b69
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg