[automerger skipped] Merge changes from topic "ignore gid difference" am:...

[automerger skipped] Merge changes from topic "ignore gid difference" am: 7b0c7c82 am: 83cba714 am: 15eeadee -s ours

am skip reason: Merged-In I0cbfaa195d42140426bea533fe83f1d73ac806e2 with SHA-1 d836a1bf is already in history

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



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