Merge "Re-add return statements accidentally removed in aosp/2461534" am: 805a89bf am: 323faab5

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



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