Merge "Fixed two icons shown after switching to single SIM" into main am:...

Merge "Fixed two icons shown after switching to single SIM" into main am: 5cecc99d am: c064b51a am: 4e1d5243 am: 1ef26c55 am: dd266912

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2731569



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