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