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

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

Change-Id: Ib315843f0e1bc550b5e27a1607ffc054206b1e6e