tree 5eaf386c1eb38f5d7e90b567071fce0f5c7b3f2a
parent c00820f98f46ed4b7f2994cb3d699215900573e3
parent 711851e45fc935809c7d15bb24b07d34fba37c4a
author Nate Jiang <qiangjiang@google.com> 1596072361 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596072361 +0000

[automerger skipped] Revert "Revert "Update IMSI protection notification flow"" am: c8fffc4ce9 -s ours am: 711851e45f -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: Ic8c635b88d9cd392623a780c78b9c4caa27d5863