[automerger skipped] Merge "Clean up SMS filter handling." into rvc-qpr-dev...

[automerger skipped] Merge "Clean up SMS filter handling." into rvc-qpr-dev am: 83b3cdf5 am: 4a3e6eb6 -s ours

am skip reason: Change-Id I280d8e4c0847bf261e0497f95231a5063dfa025f with SHA-1 19527a20 is in history

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

Change-Id: I42ccd7449dd73a815c5ceced969a6964fb5426d0