[automerger skipped] Merge changes Ic6bdeac0,I633a681c am: 6c7b8cab -s ours am: 7652c4c3 -s ours

am skip reason: Merged-In Ic6bdeac05fedd02045d094fe2d1cbbaa7413208a with SHA-1 db7565b9 is already in history

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

Change-Id: Ia3b0a47d18ba4cf0dcdbd75d71435a3d1e627bb7