[automerger skipped] Update IMSI protection notification flow am: 024aad2e07 am: 78d1d902f7 am: b61660c391 -s ours

am skip reason: Change-Id I8be7c1b9e66162fdd244946b47367290116a7747 with SHA-1 47c6557f93 is in history

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

Change-Id: If03b68d5e5bf45fd21e8e6d4de4fa9130a817833
tree: 7ea4d5728401f7ddaf96c74f7a367323b6ee9811
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg