[automerger skipped] Merge changes Id3366236,Ie794c236 am: 8afddbc6 am:...

[automerger skipped] Merge changes Id3366236,Ie794c236 am: 8afddbc6 am: 701cb9f7 am: 676163ff -s ours am: 3600a82b -s ours

am skip reason: Merged-In Id33662363908e47e5827f256d675888ccd516704 with SHA-1 ceac468c is already in history

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

Change-Id: I6ee000759384bb3359464bc7b23ee114f39ca4ed