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

[automerger skipped] Merge "Revert "Update IMSI protection notification flow"" into rvc-d1-dev am: 17b33e6223 am: 2e182fbb19 am: fabfb81b06 -s ours

am skip reason: Change-Id I28ab0d5322f3729ef81244ddac5db40ba10efcad with SHA-1 34c8b28388 is in history

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

Change-Id: Icd24c2b1199e33edf6069e976289da0056eecf94