Merge "Keep the merged WiFi indicators when WiFi toggle changes." into...

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

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

Change-Id: I3d54fc0a31dadfa4e9b052021d09867a927970fa