tree 74d10995c161d3aecae2b4dc7ea6ee7e2a162378
parent 1e8fc69742f1cf75d608429acffde77d1d6c39ac
parent c00820f98f46ed4b7f2994cb3d699215900573e3
author Nate Jiang <qiangjiang@google.com> 1596073232 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596073232 +0000

[automerger skipped] Revert "Revert "Update IMSI protection notification flow"" am: c8fffc4ce9 -s ours am: 6de25b34bc -s ours am: c00820f98f -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/+/12264896

Change-Id: Ia1220fb6ec7a04777c2f92c54d8761c14f25019e