Merge "Rename callback variable name" am: 9dd132f3 am: 9174bb02 am: c10177fa am: 8e51d1a7

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



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