Merge "[SB Refactor] Fix MobileNetworkTypeIconsTest" into tm-qpr-dev am: 8e91c4ef53 am: 33e2c792d7

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

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