[automerger skipped] Re-add return statements accidentally removed in...

[automerger skipped] Re-add return statements accidentally removed in aosp/2461534 am: 4d0dcaf5 -s ours am: d1c0f80f -s ours

am skip reason: Merged-In I8cee8609b439762dffb97fde39ad0becc2b15c78 with SHA-1 3dfe7106 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23781881



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