Merge "Fix SystemUI mapping SIM state error issue" into udc-dev am: 6fd60cc205 am: 0d667d0cd6

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

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