[automerger skipped] Revert "Update IMSI protection notification flow" am: 70ede8ce05 -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: I7e2b33112a611e36f601056ff46271efd58aec30
tree: 7f990d0a235fe206893280357d639e0ca0a4c036
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg