Merge changes from topic "unused" am: 42a600e8

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



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