[automerger skipped] Merge changes from topic "LCE_ENDC" am: d046f19c7f am: 587cce5bfa am: d44aef6533 am: c3c48eab36 -s ours

am skip reason: Change-Id I1dc9f4e2a085cd26c3133a5c026971dbfc9145d7 with SHA-1 24c88d7e4e is in history

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

Change-Id: Ifc8c7ab2ec8a6f4cde12ea2d4b84f6da2328c2d3