[automerger skipped] Fixed the mismatched protocol anomaly detector am:...

[automerger skipped] Fixed the mismatched protocol anomaly detector am: d9f650f7 am: 4c54baaf -s ours am: 1a58244f -s ours am: d7efd516 -s ours

am skip reason: Merged-In I13bb670117a51c4778a06e8125db6693bbde2cd8 with SHA-1 432f8c90 is already in history

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



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