[automerger skipped] Merge similar data profile - ignore gid difference am:...

[automerger skipped] Merge similar data profile - ignore gid difference am: a9c12470 am: c1d1cfb3 am: d1c38eaa -s ours

am skip reason: Merged-In I2a8300ad28a70cfd3b570d7ec9e2cafcdc010d2e with SHA-1 5d3ec4f9 is already in history

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



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