[automerger skipped] Merge "Fixed the mismatched protocol anomaly detector"...

[automerger skipped] Merge "Fixed the mismatched protocol anomaly detector" into tm-qpr-dev am: 087c4703 am: bff92350 -s ours

am skip reason: Merged-In I13bb670117a51c4778a06e8125db6693bbde2cd8 with SHA-1 0d0a315b is already in history

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



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