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

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

Change-Id: I548a9ca1f5f2d9f9970c1751a9aebe64eb00f3b1