[automerger skipped] Merge "Revert "Update IMSI protection notification flow"" into rvc-d1-dev am: 17b33e6223 am: 85b25e0855 am: 6b6be7a909 -s ours

am skip reason: Change-Id I28ab0d5322f3729ef81244ddac5db40ba10efcad with SHA-1 34c8b28388 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12266905

Change-Id: Ib9e842544357e2769a8d5f42cc241379d64ebeb0
tree: 74d10995c161d3aecae2b4dc7ea6ee7e2a162378
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg