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

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

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