Merge "Fix WiFi + "x" stil visible" into rvc-d1-dev am: a270a22a23 am: 218558285d

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

Change-Id: I69a513d0d1942ce81703660035a164cc4d0bbda8