Merge "Use WifiEntry#shouldShowXLevelIcon() to show X in level icon" into rvc-qpr-dev am: a2da145ff6

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

Change-Id: I1910ca04565e936cd5054cb199aa074ead91cc0e