[automerger skipped] Merge changes from topic "Added a new config" am:...

[automerger skipped] Merge changes from topic "Added a new config" am: fe84e6d0 am: f41ced86 am: 7d4f1e9f -s ours am: f7ba3189 -s ours am: be0ad375 -s ours am: 98dad9bf -s ours

am skip reason: Merged-In I8d44f4968a605538ce174bc97ba95b334dc77b1c with SHA-1 65a6c8b2 is already in history

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



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