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

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



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