Merge "Eliminate the interfere of removeMessage for dual-SIM" am: 523c6541bc am: 493c8dfc13 am: 054dca6d9d

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1623679

Change-Id: I9d866daba0b14eb5678dc598aa837826657dae14