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

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

Change-Id: If6729fd5951ea46f49c7b5c82b0e922e52319186