tree 5200802552d08d099c31f2c4454e51a420cd49ae
parent 5768697168acaaa1273f8286b3f7bc44df076cb8
parent c4392736ae5106335584f84d9a29211768f6588b
author TreeHugger Robot <treehugger-gerrit@google.com> 1638824801 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638824801 +0000

Merge "Keep the merged WiFi indicators when WiFi toggle changes." into sc-v2-dev am: c4392736ae

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16389553

Change-Id: I188c4dc31e310ea187609513fad95f1321b6b89b