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

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

Change-Id: Ieb148ef187b53a14b9f3ab5c707c1bef22cafe9b