Merge "Revert "Update IMSI protection notification flow"" into rvc-d1-dev am: 17b33e6223 am: 2e182fbb19

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

Change-Id: I5257cfc2ac8b0d6e1862ffa1485429eeb6a70caf
tree: 2049669dd9177aaaa82f4d1acf15f8a18206bf49
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg