[automerger skipped] Trigger anomaly when data stuck in transient states am:...

[automerger skipped] Trigger anomaly when data stuck in transient states am: 4ac58a97 am: 84134cef am: 8f24cfb8 -s ours

am skip reason: Merged-In I7dfbe3b14c2c7d5cbc44db2985a572ba808aa847 with SHA-1 4fd23563 is already in history

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



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