Merge "Fix SystemUI mapping SIM state error issue" into udc-dev am: 6fd60cc2 am: 0d667d0c am: 931acdf3 am: 5e7ae893

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



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