[automerger skipped] Merge changes Id354c362,I96d5f7f7 am: 6ffe0b1b am:...

[automerger skipped] Merge changes Id354c362,I96d5f7f7 am: 6ffe0b1b am: a5e1b0f3 -s ours am: f2513864 -s ours

am skip reason: Merged-In Id354c362973181c25bee8fe26f0d680b05e49f19 with SHA-1 b0cb93e8 is already in history

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

Change-Id: I292e45a99b6859c0bb0677e100909d74d5a133ea