[automerger skipped] Revert "Update IMSI protection notification flow" am: 70ede8ce05 -s ours am: 4adec776ea -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/+/12241971

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