[automerger skipped] Revert "Update IMSI protection notification flow" am: 70ede8ce05 -s ours am: 135d075c32 -s ours am: 8f597dbfbb -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: Icf8d407d443758ea190ded55d0b18325a6587c45
tree: 9887dd384f1eaea7c6471ed75a67ad83307b81c3
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg