Merge "Rename callback variable name" am: 9dd132f3 am: 9174bb02 am:...

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

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



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