Merge "[SB Refactor] Show space between wifi and RAT icon if needed." into...

Merge "[SB Refactor] Show space between wifi and RAT icon if needed." into udc-dev am: 46c1fea2 am: 75fecd34

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



Change-Id: Iab02e39cd8f21415092eed8be839a0182834b750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>