[automerger skipped] Merge changes If304eff5,I7b56c2d2 am: ac13fd6a am: 41f4ac9c -s ours

am skip reason: Merged-In If304eff5454054c614d23e554c346ec2c7819e83 with SHA-1 6be58e08 is already in history

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



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